:tada: fixing #12