Fixing #307