fixed GH# 254