Last change got wrongly mixed somehow. Reverting to previous commit