fix issue @Author : Alex