bugfix. related to gh-500