Added If-condition