this completes fix to #207