Solves Github issue 220