Revert "Revert "fixes 7""

This reverts commit 6465a059e9314d516d53bba48bb0f54c10109649.