Updated to patch bug