hackish fix, need to deep dive for proper fix