Quick fix for crew applications