quick fix for pr 167