Fixed the issue!!

Fix @578.