Tweaks, Bugfix v1