Fixed from address not being set correctly