Minor change to improve setup