fix #364

I am not sure whether this is a workaround or a fix.