Fix applied as suggested