Fixed: #56 (with a derpy fix)