Still trying to fix codeschool bug2. fixes #1