Fixing GAP application