issue #30 really fixed