Fix for setup