fix ticket 42