[Core] fix pr #192