Attempted to fix duration bug... Not fixed