Changed behaviour on database