Attempt to resolve #13 again