fixes for ticket 38
fixes for ticket 38
fixes for ticket 38