Partially fixed the problem as mentioned in #22