fix: issue #499