fixing the bugfix