Fixes #131

#131