Fixed some behaviour with CSI with suffix d