Fix double subscription bug