Fix for Issue #480 failbotage