Fixed bug with wrong address in case