Fix issue #33

#33