Remove default value, add some more logging