refactor fix in 67c4c90159428d700766ac610ca374d764cea6a7