partial reversion from issue #62, removing setter