fixes an exception issue related to commit b4993c2c6fef03647b0fe172d539cbf51d82beab