Fix #82 and #81
Fix #82 and #81

gobrave/modules,Avantinternet/modules,nWidart/modules,bdmpubs/modules,pingpong-labs/sky,pingpong-labs/sky,Priyank57/modules,syahzul/modules,foxmedo/modules-1,pingpong-labs/modules,vedovelli/modules,pingpong-labs/sky