Fixes #422

This fixes issue #422