fixing backwards compatability