fixed flicnhing properly