Fix to BSC for long data