fixed bug present from AJ