Fixed & tested with basic config