#296 - Slight bug fix(cherry picked from commit c3f92d9b3c9028a430f20bee86aba1d58fa2aa56)