Fix already active bug