Fix for sandstone pipes