reverted last change and fixed catalina