posting fix until refactor