Fix loader listener