Properly handle 1500