Potential Fix for #97 for LF