Merge #356 fix from 3.0