Fixes #238 - Toolkit design problem