Fixed small time bug