Possible fix of one issues