bug fixes?
Revert "bug fixes?"

This reverts commit 20bb54efc74d5e84dea5313d212723280909e059.
back in time...