short circuiting fixed