[Fix] Fixes #59