Fixed size bug, but may not be completed