Add ASSERTs again