Fixed #10 by a temporary solution.