Fix #17

Fix for #17