Fix for #17

Fix for #17