@pierogiburo looks like it works properly, as far as I can tell