bugfix attempt 3