Added some code to avoid warnings