Fixed problem with DefaultBinaryStore