Still trying to fix codeschool bug. fixes #1