bugfixes :DDDDD