Bugfix attempt.