I reverted last patch for a little bit due to soft-locking bug :(. Borking on a solution.