Test fix for issue #18 from celeron55