Fixing problem for #282