Tickets #188 & #204