Fixed #1: Problems with JSONStorage