This should fix some problems =/