Fix for docker v0.6.1