See #52 issue