Fixes #14 might break the designer