fixed for amanda