Finally bug free