Possible fix to a bug