some more changes
Workaround for BLX