Attempt at fixing https://github.com/octobercms/october/issues/67