added 'if' condition as per v0.99