#1841 second commit with additional fix