#391 latest fix and added one more test