occasion bug fixes