Added an ultra-necessary if-statement