Reoccuring fix

untested!