Fixed unstoppable bugs