Removed Thomas' fix again