Fix #127

@xbreezes