Fixes error from merge