Fixed one problem and introduced another