Maybe fix @Arnavions maybe-fix #886