reverting to old way, maybe it'll fix issue 7