bugfixes thx to commilitones