removed first part bug