#167 dirty fix.