Fixed Issues