Fixed name too long error