Fixed old bug