Fixed for LPKF limitations. Ready for Nystrom via method.