Actually fixed setup this time