more changes for rubber to fix issues with updated code from original repo