This is a proper fix, i guess.