#4: fix issue