Bugfix try #1