Finally fixing our problem