Fix bakeSingleton not working when used with pack