issue 542 possibly fixed
Merge branch 'issue542' into develop