Bugfix (shame)