bugfix attempt 5