bugfix for 912 and 884