Fixed bug in recent change