Fix #382 - Refactor 16bit addressing issue to fix rel32 calculation