Fixed issues with integer not multiple of 3 and  5