Fixed - issues