Corrected 2 chunks thx to beta-tester