Fix for sandstone pipes

As described on #1193