fixed GH# 316