working on a fix for ticket #212