Fix for #474