Added complexity to fix Issue #4