simplify. See #33