Fix for decorator inheritance