fixed row/column issues