minor implementation change