Added edge case for 18