Skyboy's single-use container fix (more or less)