cleaned up quick fix