Fixes throwing errors