Fix for #603