schoolboy bugfix