Incorporating core bug fix