bugfix for 804