DRY mofo. Issue fixed