added couple fix