fix to fix
Merge branch '21-apply-dots' into 28-applydefine