Could not reproduce issue #43, made some changes which might fix it.