Fix #484

This fixes issue #484 which I have just submitted.