quick fix for last 2 commits