Fixed small corner case