Son's fix

Fixes issue #1