re-included fix for GH# 172