decorator fixes