MIFOSX-995 - Fixed Grace periods