athena decorator bug fixing