Fix for #255