Fix for graphic problems