Gh375 - merge branch

use an if with return at the end; this way is no need to create another if after