Bug fix (NullPointerException)