Fix for logical failure