Fix issue #114

#114