removed huge bug