Applied fix and removed substance L&F workaround