temporary fix for issue 257
Merge branch 'issue257'