Fixing issue with #376