Decorator fix

Fixes for #27