Fixes Issues in GH #121