Bugfix attempt #1