Simplfy code, See #140