[Core] Small update to fix #83 aswell, hopefully