quick fix for now, improve later