Deploying fix for issue with #227