Fix for #451

This should do the necessary.