Fixed drawing problem