fix ticket 38