External Storage Fix