#37 Bugfix wiggle