#261 Getting closer to bug-free state