Tested and fixed #94