Fix right, bottom bug