might fix issue #14, but I didn't test it yet