Fixed pivotal ticket 64554890