v1.6.1: hotfix regression http://meta.stackoverflow.com/q/221733