hard coded line numbers seem to be fixed now