Fixed #312
Merge branch 'bugfix/312' into develop