BUGFIXES again STUPID!