3.6.4.1

Added fix by krad (you can thank him)