Tweaked the bug