Fix relating to applications is still needed