Fixed Commit: https://github.com/annariel/dw-free/commit/053cdffbb10f9548084241ddfdfbd78512ca39fb