#271 Fix. Removed all branches from the fork, and trying now to commit the fix again in a clean branch