Fix for #34

Fixed #34