Fixed #8 etc.