Fix for graphic out of bounds