don't merge yet, found another bug...