Fixes that last problem again