FIX: Slight speed decrease for backwards compatibility