Bug fix thanks to vjbangis viray