Fixes https://github.com/octobercms/october/issues/606