Fix issue from 1.4 merge