bugfix attempt 7