fixes #7481

@hargup can you please check this out.