fixed GH# 251