Fix problem #47 for current contains? behaviour.