Fixed temporary handling.