fixed @brettweavnet suggestions