Related to #43. Namespace problems