fixed GH# 259