bugfix for 804

occasional pull request! please delete it