Add partial fix to enhancement #73