fix issue 4, finally