Problem 11 Bugfix (Port from PE Plus Code)