bugfix attempt 4