Fix #561 - Ambiguous load/store implementation