Small fix for easy swap