FIX: postges compatibility for latest changes