Feature #439 & #430