implement feature #354