Revert "bug fix"

This reverts commit cae4deb0cafb30bd9436a276490a990a92b5f701.
Revert "Revert "bug fix""

This reverts commit cfde9df5f15e4d948bd9ec92148d7e71b08ba5fa.
bug fix continued... :)