Bugfix attempt 2.