[Core] fix pr #233