Basic fix for LW compatibility