Fixes resolve issue from #894