Variables manager - Fixes #394

Fixes #394