Final fix for BLX