Finally got rid of this fucking bug