issue #30 & #31