Fix #34 by changing property setter logic as advised.