bugfix to the bugfix to the bugfix