[No reviewer] Iss403

Fixes #403