Fixes #102 Juno support