Fix for #319