Small opt. fix