Card #149 - correct loading