fix ticket 30