Additional fix for issue #48