bugfix for 353 and 956