complex issue fixed