Tilovell/1543 windowlocationorigin j sbug

Fixes #1543