Fixed Mickes horrible bug