Fixed the following bug: