diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
index 1b674b077..bc63e83e0 100644
--- a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
+++ b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
@@ -10,10 +10,9 @@ import ExercisesNameContainer from '../../../containers/ExercisesNameContainer';
 
 const ReferenceSolutionDetail = ({
   description,
-  uploadedAt,
-  solution: { userId },
+  solution: { userId, createdAt },
   exerciseId
-}) => (
+}) =>
   <Box
     title={
       <FormattedMessage
@@ -51,7 +50,9 @@ const ReferenceSolutionDetail = ({
               defaultMessage="Description"
             />
           </th>
-          <td>{description}</td>
+          <td>
+            {description}
+          </td>
         </tr>
         <tr>
           <td className="text-center">
@@ -64,9 +65,9 @@ const ReferenceSolutionDetail = ({
             />
           </th>
           <td>
-            <FormattedDate value={uploadedAt * 1000} />
+            <FormattedDate value={createdAt * 1000} />
             &nbsp;
-            <FormattedTime value={uploadedAt * 1000} />
+            <FormattedTime value={createdAt * 1000} />
           </td>
         </tr>
         <tr>
@@ -85,14 +86,13 @@ const ReferenceSolutionDetail = ({
         </tr>
       </tbody>
     </Table>
-  </Box>
-);
+  </Box>;
 
 ReferenceSolutionDetail.propTypes = {
   description: PropTypes.string.isRequired,
-  uploadedAt: PropTypes.number.isRequired,
   solution: PropTypes.shape({
-    userId: PropTypes.string.isRequired
+    userId: PropTypes.string.isRequired,
+    createdAt: PropTypes.number.isRequired
   }).isRequired,
   exerciseId: PropTypes.string.isRequired
 };
diff --git a/src/containers/ReferenceSolutionEvaluationsContainer/ReferenceSolutionEvaluationsContainer.js b/src/containers/ReferenceSolutionEvaluationsContainer/ReferenceSolutionEvaluationsContainer.js
index e9f95faaf..4eb12774e 100644
--- a/src/containers/ReferenceSolutionEvaluationsContainer/ReferenceSolutionEvaluationsContainer.js
+++ b/src/containers/ReferenceSolutionEvaluationsContainer/ReferenceSolutionEvaluationsContainer.js
@@ -28,13 +28,12 @@ class ReferenceSolutionEvaluationsContainer extends Component {
 
     return (
       <ResourceRenderer resource={evaluations.toArray()}>
-        {(...evaluations) => (
+        {(...evaluations) =>
           <ReferenceSolutionEvaluations
             referenceSolutionId={referenceSolutionId}
             evaluations={evaluations}
             exerciseId={exerciseId}
-          />
-        )}
+          />}
       </ResourceRenderer>
     );
   }
@@ -51,7 +50,7 @@ ReferenceSolutionEvaluationsContainer.propTypes = {
 export default connect(
   (state, { referenceSolution }) => ({
     evaluations: getReferenceSolutionEvaluationsByIdsSelector(
-      referenceSolution.evaluations
+      referenceSolution.submissions
     )(state)
   }),
   (dispatch, { referenceSolutionId, exerciseId }) => ({