Fixed expading issue