Fixing fs#317