Attempt bugfix