QQ: dirty fix #153