Bugfix #2 to previous commit