Robinlovelace Fix #173