half-heartedly fix #333