fixed johan