Re-do temporary fix for lmath