Fixed cut-off issue