Fixed in handler and little bit of the draw call, everything seems to work as intended