Fix to support work i3 as well