bugfix: the previous fix is not really a fix