Revert "possible bugfix?"

This reverts commit 12009d2acbaff6cf64cf8ac22a4660b571125e28.
actual bugfix