ESSENTIALS-311: minor bugfix for onBoard short circuiting.