Janky workaround jm