Backwards compatibly fix