Fixed issues with small breakpoint