Although fix for that, is pretty hackish, at least right now :(