Fixed additional double ? edge cases