Fix/273

Fixed #273.

Finally. Not sure what I was sitting on :-\