Fixes #17.
Note: This fix is only for the deployment stage. Opening a different bug for runtime adaptations.