Revert "minor stability fix's"

This reverts commit 22c6918adad2ef6e70a8a725e74c0c25b70b52a0.