Revert into version 1.3.0 as I prepared a fix based on it