Fixed obsolete response / Added missing if (...)