Add check suggested by Norbert