quick fix issue 501