Fixed to work with Docker 0.9