Fix for LAF