Fixed license and bug which was detected by user