Resolved guard-less issues by using my own fork