fixing multiple calls