Additional fix to #3