v1.0.26 Fix for a critical bug