Fix for #544