Fix: Solves #100