fix issue #272
Merge branch 'gt#272' into develop