Bug #4390: Data type changing by itself

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Merge pull request #1172 from D-storm/bug-4390

Bug #4390: Data type changing by itself