#1345 partial fix