fix ticket 549