Fix #828

Fix for #828.