#173 #174 Appear to be fixed